From 5c90b4672201327164beb4cc8a1c5b2fc2cb6814 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 31 Aug 2013 16:16:26 -0400 Subject: [PATCH] Revert "a11y: Check whether a widget is mapped before querying its parent" This reverts commit 7e3db6fdd36960fca0ae0e7e078b448b5f8b220a. It broke the testsuite. --- gtk/a11y/gtkwidgetaccessible.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gtk/a11y/gtkwidgetaccessible.c b/gtk/a11y/gtkwidgetaccessible.c index dbb7a5b2f5..841ae14e3c 100644 --- a/gtk/a11y/gtkwidgetaccessible.c +++ b/gtk/a11y/gtkwidgetaccessible.c @@ -174,9 +174,6 @@ gtk_widget_accessible_get_parent (AtkObject *accessible) if (parent != NULL) return parent; - if (!gtk_widget_get_mapped (widget)) - return NULL; - parent_widget = gtk_widget_get_parent (widget); if (parent_widget == NULL) return NULL; @@ -240,7 +237,7 @@ find_label (GtkWidget *widget) temp_widget = label; while (temp_widget) { - if (temp_widget == widget || !gtk_widget_get_mapped (temp_widget)) + if (temp_widget == widget) { label = NULL; break; @@ -274,7 +271,7 @@ gtk_widget_accessible_ref_relation_set (AtkObject *obj) label = find_label (widget); if (label == NULL) { - if (GTK_IS_BUTTON (widget) && gtk_widget_get_mapped (widget)) + if (GTK_IS_BUTTON (widget)) /* * Handle the case where GnomeIconEntry is the mnemonic widget. * The GtkButton which is a grandchild of the GnomeIconEntry @@ -296,7 +293,7 @@ gtk_widget_accessible_ref_relation_set (AtkObject *obj) } } } - else if (GTK_IS_COMBO_BOX (widget) && gtk_widget_get_mapped (widget)) + else if (GTK_IS_COMBO_BOX (widget)) /* * Handle the case when GtkFileChooserButton is the mnemonic * widget. The GtkComboBox which is a child of the @@ -443,7 +440,7 @@ gtk_widget_accessible_get_index_in_parent (AtkObject *accessible) } } - if (!GTK_IS_WIDGET (widget) || !gtk_widget_get_mapped (widget)) + if (!GTK_IS_WIDGET (widget)) return -1; parent_widget = gtk_widget_get_parent (widget); if (!GTK_IS_CONTAINER (parent_widget)) @@ -784,9 +781,6 @@ gtk_widget_accessible_on_screen (GtkWidget *widget) gtk_widget_get_allocation (widget, &allocation); - if (!gtk_widget_get_mapped (widget)) - return FALSE; - viewport = gtk_widget_get_ancestor (widget, GTK_TYPE_VIEWPORT); if (viewport) { -- 2.30.2